Restored old safeForward