This definitely works in 2.9 from the legacy svn