Revert 9334693..42ddabb

This rolls back to commit 93346939c6251a063a4e7599f22d9dc1e5a976af.