Revert 4111a99..0603a00

This rolls back to commit 4111a990838f1cca22b80296e896f0a4e07afd63.