Partially revert, address other feedbacks