Remove change from KFSPTS-3595 it is not yet ready for prod, was pulled
by mistake