Revert cb276b5..2141741

This rolls back to commit cb276b51ecee7428d75ecbdf494d83b5a44a671d.