This hack is no longer required as limpopo is fixed in that respect