Backout rev 18c1fd169792 for causing issues with the fuzzers. r=luke in-person