revert to Dec 4 commit