Revert 7197eff..702390b

This rolls back to commit 7197eff43e6f044a97620c86c9aa821dde6f54b6.