I presume you didn't actually write this @jbau, instead this was pulled in from someone else's branch (master?).  Is that right?