Revert 3570b42..975ff7f

This rolls back to commit 3570b42842186ed6cc2dc1834ae60c7112b71555.