Revert snakeoil #2.