Compatibility with rust fb018a3d4