Revert b6aba36..f053c18

This rolls back to commit b6aba36bf67c2f21a1cd9f13995b8bfbe56f3efe.