Revert a7202cf..f0aeefc

This rolls back to commit a7202cfc0cb41c28959d5969bdecc936bc6ca5bb.