Revert 235e25c..af9018f

This rolls back to commit 235e25c24ce11c454ff8e02832ba88bb137ebc2a.