Revert e038244..40c6238

This rolls back to commit e0382445566abfe04fcccb5fa3fc8f2365d4cc01.