Revert my commit, and TWN's one - this message is actually in use!

This reverts commit 109ea380489d8a25ec533f51f5d151ede12f589d.

Change-Id: I7e0888b2927fdc1f904538c36f6eac07234d8e09