Reverted changes made to tests for r1893 (#11691).
Authored by: emassip 2012-08-24
Parent: [r10234]
Child: [r10236]