cleanup of 35276664a87ec250badf06adf109077664c4a171 (jshint is not complaining about that with our config)