Resurrect the safe part of r5274