Revert "checkin for JO"

This reverts commit fad8f45ba62ba5b24d3d2e83018de357d303a7ed.