--- a/components/python/greenlet/Makefile	Mon Feb 02 19:25:18 2015 -0800
+++ b/components/python/greenlet/Makefile	Mon Feb 02 19:31:12 2015 -0800
@@ -50,15 +50,8 @@
 COMPONENT_PRE_BUILD_ACTION = \
 	$(MKDIR) $(SOURCE_DIR)/64
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -shared
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
+LDSHARED=	$(CC) -shared
+PYTHON_ENV +=	LDSHARED="$(LDSHARED)"
 
 # One of the tests, test_exception_switch (tests.test_cpp.CPPTests), 
 # failed in 64-bit. Skip it for now.