Revert cb26dc0..e4b1b52

This rolls back to commit cb26dc03cc7e251c0a32e41706ec64a6ae9f2873.