Revert 42cd2d5..d3c0a67

This rolls back to commit 42cd2d5bf0956013bac94be4c2fc588411d816ea.