revert merge change unrelated to WEB-7316