Revert part of previous commit so that search and replace step 3 is parsed properly.