Commit 3838010a added code that was subsequently made redundant by commit 668a2898 but never removed. This patch cleans things up. Change-Id: I59fcea6f5bb19e0bc57856600a85a18419cf8730