[SHRINKRES-140] Reverted some unrelated changes introduced by a6919330a3e11a5f8b5ce242124ef789b910dbe9, build currently failing due to convergence errors