Revert 4e75eb5..d42f22f

This rolls back to commit 4e75eb54f45a1873cbec4191122040b3049c80f2.
temp0928