Remove local hack used for tests