Undo code changes for scrubber module that are only relevant for master branch