@dmitchell - Are you good with this change?
@abdoosh00 - If making this change, please remove the commented out code.