This is done to be able to use this implementation of the feature in the activities. A complementary patch is needed in sugar module.