...instead of a warning, now that all the deliberate changes have been
addressed.

Change-Id: I6075a36a560bd68826c6840992eefb8f51b939ba