Revert 1b2c68d..dfd2215

This rolls back to commit 1b2c68d98c74bdc175590c9f7f555c4613cf318e.