Revert "SERVER-14413 don't forget to link in heap1 registration"

This reverts commit 522347375e6859b9dbafdc4f0bbdd462f98321fa.
Merge remote-tracking branch 'upstream/master'