Actually used with follow-up commit
b94de8fa

This reverts commit e24a02dc.

Change-Id: I0f8226f756c7b3a813600351cc1be9bbbbcf67c2