Revert of previous commit

Reverting 626061fd28e3f78b662bbef0f60d13b15c9acebd.