Revert be57d05..5602264

This rolls back to commit be57d054059e3d12e44314adab1d2c9a3269f03a.