Closes #10274 (closed), #17017 (closed), #10261 (closed), #10265 (closed), #10263 (closed)
This will create a new commit in order to revert the existing changes.
