Revert 1cf4d3d..f16f705

This rolls back to commit 1cf4d3d9cb9916f30ae006f95a247539f850a259.