Removed some changes which sneaked unintentionally.