--- a/components/python/markupsafe/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/markupsafe/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -40,16 +40,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)
-
 COMPONENT_TEST_DIR=	$(COMPONENT_SRC)
 COMPONENT_TEST_ARGS=	setup.py test
 COMPONENT_TEST_ENV=	PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)