Revert "Rev.0802"

This reverts commit 22c5f898824dff6c42a922bfcc44086cbf2a457b.