Both removed in 3d00439