This will become obsolete once rida becomes the default


Former-commit-id: 396fc9f2bfcc181ab957bc2cd4da973ae9da2bb3