This reverts commit 425dda76. This commit is currently causing BOLT to crash in one of our binaries and needs a bit more checking to make sure it is safe to land.
