fully restore 2.3.10 behaviour