drop workaround after KT-3313 fixed