Revert be8d2c2..0d45a42

This rolls back to commit be8d2c2ff9561555ff2fd9c3352fb7554d6f3832.