Revert e464e88..b796d53

This rolls back to commit e464e884e96c64535195c72b3719a5166b5227fa.