revert back to previous
comment
comment
Pull in changes resolved in ticket, add error logger back in.