revert last changes breaking tests