"Fix ugly hack to at least be consistent with itself", haha, this is brilliant.