Don't hack the code to avoid fixing the hackish tests... I'll fix it in the tests.