Revert 4b6d999..eeb6172

This rolls back to commit 4b6d999126a2dd0c048f6e3518a98d40d5e95995.