Breaks Quick tests. This reverts commit 60654023. Change-Id: I8a5469ba7cea5f46b85cb489b3e0ef06ed548f03