u/danielw/dm-1395

Creating PR for reviewing DM-1395
Will these commented-out line ever be used? If not then they should be removed.