Thanks to Fridrich for finding the real cause for why I thought this was
necessary..

Change-Id: I77934b17c2b994a03cae5440253b165704de2fa4