Revert 5d92300..1070a44

This rolls back to commit 5d92300a43df398ccfa8b93d6dfdfdb294184bcc.