bring back some changes from 0.4.27.2 to 0.4.25