Revert 7c0eb35..d4b2838

This rolls back to commit 7c0eb35ecdfa9501f56849faea4f193fa8c1987e.
Revert