This reverts commit ad724437. Reason for revert: unreliable signal Change-Id: I373dd03cfe1c4711d83ae4f3105f561420a5df2e