this wont be necessary after #686 is merged.