Manually copy over stage support from the freebsd-current branch