Revert changes from rev. 30849

No match.