please revert backport of 44c76825d6eefee9eb7ce06c38e1a6632ac7eb7d