Pr 1679 fixed up

This is #1679, fixed up to pass the build.