diff -r 66a6b4289021 -r 137fdcb27c8e components/python/librabbitmq/Makefile
--- a/components/python/librabbitmq/Makefile	Mon Feb 02 19:25:18 2015 -0800
+++ b/components/python/librabbitmq/Makefile	Mon Feb 02 19:31:12 2015 -0800
@@ -43,16 +43,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 # common targets
 build:		$(BUILD_32_and_64)