Reverted change to accommodate #1 for now - issue is on hold.