am 3c8b44e3: Remove old -night values DO NOT MERGE

* commit '3c8b44e3e1f59dd21f224464aa8378f563581cc9':
  Remove old -night values DO NOT MERGE