UAR-417 - Adding FIXME tag for commented out line, details of the issue are in those comments.