Revert 4280f9f..c5f3153

This rolls back to commit 4280f9fada39adb2a82cf1e9c71e5e46f83f45d0.