Revert "ifdef guards around optional code"

This reverts commit bb987c996230810c225515a524815fae1e1bf0ca.
better