Link to #3867 (closed) and !620 (closed)
This will create a new commit in order to revert the existing changes.
