Revert 37bcdfb..dfb261a

This rolls back to commit 37bcdfb08b8ef6e414ffcadf6dbb456c820070cd.