removing comment...
(cherry-picked from a045a08)