undoing accidental merge of feature-rsi branch