9ea39353b4
This reverts commit 06ce1329a044b8e7be9db59811d4f4316d0d0743. bug 1059923 patch was found to not be a valid fix. Change-Id: I465974f60fd65b4d2c9449267ab108fac13d70c8