Revert 85fc79f..4603dd4

This rolls back to commit 85fc79f2c98344ca4c966c28998cb0aa01c9b8ad.