Revert change

(cherry picked from commit aaf5fafaea9dd0a1f9a3643fa67a034d858d2599)