diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0594a4e87..152dbcd15 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-01  Christopher Faylor  <cgf@timesys.com>
+
+	* devices.h (_major): Revert previous ill-advised change.
+	(_minor): Ditto.
+
 2005-12-01  Christopher Faylor  <cgf@timesys.com>
 
 	* exceptions.cc (handle_exceptions): Translate a guard page exception
diff --git a/winsup/cygwin/devices.h b/winsup/cygwin/devices.h
index c885fb09d..5d294ffbe 100644
--- a/winsup/cygwin/devices.h
+++ b/winsup/cygwin/devices.h
@@ -14,8 +14,8 @@ typedef mode_t _mode_t;
 typedef __dev32_t _dev_t;
 
 #define FHDEV(maj, min) ((((unsigned) (maj)) << (sizeof (_major_t) * 8)) | (unsigned) (min))
-#define _minor(dev) (((_minor_t) dev) & ((1 << (sizeof (_minor_t) * 8)) - 1))
-#define _major(dev) (((_major_t) dev) >> (sizeof (_major_t) * 8))
+#define _minor(dev) ((dev) & ((1 << (sizeof (_minor_t) * 8)) - 1))
+#define _major(dev) ((dev) >> (sizeof (_major_t) * 8))
 
 enum fh_devices
 {