blargh, workaround commit.