Reverted unnecessary changes.
(cherry picked from commit e9e1dec69b88803a0080cbdbcb28151e31674fd9)