Re-adding modules/custom/features_extra without my custom branch