Revert 9552daf..efdba43

This rolls back to commit 9552daf11ee74d8339ae10d3319a90dc8fa629b5.