I think we should leave it as-is and include it in a future cleanup since it's unrelated to this theming effort.