PTIP-24: Revised saving the little fish (phase 1)

Since this passed when is it going into affect ??!