@elupus should we temporarily return true until #2886 is ready?