Limited the no-need-for-opt-in to the RW hint