Fix RFE prefix removal

Change-Id: If52d7380c1ea6be9973be273c49b6d926d56a393