Rverted changes from rev. 4550.