The commit 81af2c introduced a serious regression by accidentally removing one import. Reintroduce it