Fixed Aaron's comments in gadhra/pangea@c0d77935b9887bb8bb0762b3734ea3a9b539a039