This reverts commit fc9875f5. Reason for revert: known to be bad. Change-Id: I9b8db53c054119f454e50007f56232312a0ba595