Revert 665a007..9cd6ae1

This rolls back to commit 665a0074b1214b1dbab63f603415510e4309406f.