As explained in previous commits, it's not safe to use JS code in child function callbacks, so let's use the safer version of it. Fixes: #6698 Part-of: <!3293> (cherry picked from commit 26e8fb90)