Revert 83bf1ed..37373cd

This rolls back to commit 83bf1ed17a27af3f653b1e40795c5362a9c239c4.
nouse