Revert d71e9cb..4649d08

This rolls back to commit d71e9cb99009f1d04e4adf978d2a8a9faf6a9b45.