Necessary to use #3009 (closed) so that it can be applied for #3008 (closed).
This will create a new commit in order to revert the existing changes.
