Revert commit [930028]

Hint: Reverts can be reverted, too.