BZ-8939 has reverted back changes which I removed accidentally