Bug 849657:  Fix bustage from changeset eb8d19e9c838.