Revert dd44986..1c7d4dd

This rolls back to commit dd44986776f1fe4cead6a608755a5babc11a260c.