Remove KT-4617 workaround