Closes #3295 (closed) and #3785 (closed). See also #3782 and #3786.
This will create a new commit in order to revert the existing changes.
