This reverts commit 80fe2f61. Broke linkage with GNU ld. See original review thread for more details.