Revert 41c97b3..a0ccd42

This rolls back to commit 41c97b3de3a4300dec9e5763f9161aa0b245d202.