Fix: get back the old behavior of 'r' switch

Get back the 'r' switch behaviour.

Thanks Alexandru for pointing this out