Revert "Checkin for JO (2)"

This reverts commit a8de1f18bff3218b1400801677ab191c52a08c55.