[WIP] The "Koco was right after all" commit.