RRF auto discovery is broken (tried to circumvent locking issue)

[cstamas]

Affected version

2.0.13

Bug description

RRF auto discovery contains hacks that needs to be undone. The hack was added to circumvent #1644 but just causes more issues. The origin issue needs fix instead.