Revert 507e6e1..1f9701e

This rolls back to commit 507e6e18e4d8b1525a7407e998ad8d676c95abbb.