Revert 8ed14c5..7bbf4b4

This rolls back to commit 8ed14c50fa487f7ae99e4d5997a84c56b12d6b5f.