Revert commit [276979]

Hint: Reverts can be reverted, too.