Revert portions of 7acb141ed7f2dedd950bb65acf878098640d081e that attempt to use a...