Simplify conditional comment and reinstate.
Merge branch 'master' of github.com:systemed/iD