Revert 7c532e2..ad101c5

This rolls back to commit 7c532e29c0a9b7b4c0dad76e2a8f0f2f6ce7872b.