affa8f75ec
This reverts commit 610ee378fc.
Reason for reapply: The change was alright, just went to the wrong
branch.