master
// FIXME: This shouldn't make it into the production code. It's quite the anti pattern but fixes the tests for the time being.