revert coreutils and kbd patch changes