Revert e8a3427..d51c639

This rolls back to commit e8a34274668fb5184f3945c89f54d39c92b0dfbf.