Resolve problem with bad commit 33480b6952b3b0741290119fa0544a7022398394
(cherry picked from commit 0234cd6)