See TT#6624 for the rationale. Change-Id: I0d62cd760a0183b5588d69d3594ee366e81fa94a (cherry picked from commit 734a5c6952)
734a5c6952