Revert e76aace..9b1f1c2

This rolls back to commit e76aace76d2b756d0dce23c50f5a1c1996504583.