revert a few mistaken changes