Bugzilla #36487: Forgot to remove the two test cases Manuel indicated. Submitted by: Manuel Mall <mm.at.arcus.com.au>