Revert 07ba70c..bd85973

This rolls back to commit 07ba70c83d7acc65e7f6f6937c6fa75ef10e15f1.