Back out 1ae5d58532ad (bug 928370) for breaking Tp5 measurement