Partially revert contrib 971b504 since not required.  If necessary, should go in Integrity step.