Revert d7bc25e..dc3cc18

This rolls back to commit d7bc25e69232533011b965e1e44a623efff30226.