BZ-11724 Reverted previous change