Revert ec6f373..5a96192

This rolls back to commit ec6f37379c25938fc4cd5b73c05e0428b6eda81b.