Includes !432 (closed).
See #3784 (closed).
This will create a new commit in order to revert the existing changes.
