Revert bf1ffa8..935ec07

This rolls back to commit bf1ffa8d29001c09846cdb52059c90c4fc91ceac.
ko co j