Revert 6f9f76b..ff6c1eb

This rolls back to commit 6f9f76b4eae9d2c9b2feb8dbe6609adb40d3448b.