DDF-938 reverted this change to make a more in-depth fix in another ticket