This reverts commit 92ad27fb92, as this was applied to the wrong branch and causes merge conflicts.
92ad27fb92