Revert e80266f..e8c3216

This rolls back to commit e80266fb3dacb1754f5460d0058e0301965c3fcc.