redo the fantastic removal of a single pound sign

Change-Id: I16a3051234d080037f3d2f86103324cf2a013aaa
Merge "redo the fantastic removal of a single pound sign" into production