Revert 854b06eab0835f495cb8a9629cc067164b448727

Commit 854b06eab0835f495cb8a9629cc067164b448727 was unintentionally
pushed in my name. Reverted it hence.