GUI-1411 reverted this