Bug 997288 - Follow-up, Part 3: Revert testing code. r=me