Temporary fix for TISTUD-5526.