I stopped smoking in Hong Kong... so I think it should be safe to remove this for now. If I decide to pick up the habit again I can always add this back in. Change-Id: Ibc0d533aa295ba9a26c61995d63610cc53a2b11e