Build fix - remove hidden methods

This supercedes Ice3e7fe6856f430c4f4eeca521f04ea3fd4b4229 which was
applied to the wrong file (17.txt)

Change-Id: I59607d512d61d780d68cec559ecdf679265408e8
2 files changed