RTC 43945: Revert invalid SAF workaround