[PATCH 06/13] Cleanups to restore things after the merge of master onto newui.