RF-13582: revert push packages refactoring