Putting back conditional comments for #100