restored 2.11.10 compatibility