Revert 0103319..37635f1

This rolls back to commit 0103319fb292f143ec208caa9417f4120aee44a0.