While fixing bug in PSS index calculation in 334519d1, I made changes in FO calculation as well. This is not nedeed and caused the FO to misbehave. Hence, reverting it.