Changed that to use the existing Discourse code.