Added the 'extra' functionality back in for bug #8296.