Closes: #17148 (closed), #17147 (closed)
This will create a new commit in order to revert the existing changes.
