Removed the changes unrelated to the CBooleans.