Revert fce92d4

This reverts commit fce92d4237d783a662b6fe10ab4c0d9ac69bd528.