reverting r42022, changes to be committed separately in order to disentangle backporting