Restores 880628 test

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 174c2d2eabbe048a55ab44cf54ea4e36cd3d4a5f)
Fix merge conflict from Bug 880628

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 74fb3b1dd864cf090a26a578615064cd9130f5e8)