misc revert earlier changes