Revert 8165daa..5f6d957

This rolls back to commit 8165daa7cadc011b5b0ace43fd40d9ce1c8b16e7.