Restored patch accidentally removed by previous commit

Change-Id: I4d4b855e5b6ecb6a272ca3b8890b22ab1d41323b