KFSUPGRADE-1010 cleanup code we contributed to 5.1.2