Revert 089c953..abd4da4

This rolls back to commit 089c95337ca361de07487bf6395dffb865c07b88.