Revert "intermediate checkin"

This reverts commit 82d6cb153180142540413ab624f20f5cd2a596a7.