cc @chrisbliss18 who originally submitted the patch in trac.