[T6] Bring back the pre-patch DSR


Locked