Revert 0216bf4..9ab8ff6

This rolls back to commit 0216bf4a10eff3ba78136a7cf9c8c8c51d1fe9db.