Revert 6185eb8..41608c6

This rolls back to commit 6185eb87b85a225cebdb280e104ef4b79714962b.