back out 2.4.x-xfs:slinx:84968a and redo change