[Reviewer: Rob] Issue624

Merging in order to get this fix into tomorrow's release, but I have a couple of cleanup comments we should address.