Revert 94ee673..97ccb1a

This rolls back to commit 94ee673c3e9d553c5b45de531c636529ba4d7fc3.