Revert 94d0bf5..092e8b8

This rolls back to commit 94d0bf5ba607f6d9adbe896ae1355a9be1a3e003.