Revert 8ba0c1e..02af4ba

This rolls back to commit 8ba0c1ebcd0744457a889e909de483dec5fafc2a.