This prooobably addresses a similar issue that Jesse looked at. We should probably evaluate both options and decide which, if any, is better.