Remove KT-4617 workaround
Buildserver auto merge