Breaks 962 and 963 run-tests. This reverts commit a6017d8f. Change-Id: I185e803640309f0055e6a3d767da201527b523e2