Revert 490f49c..6242095

This rolls back to commit 490f49c8c7ae0ecbad7f262073e2fd09c5868e9e.