revert commit e6b45e18 as it failed selection tests