revert latest changes (didn't pass QA)