re-add compatibility for builds newer than R15B01

using horrible macro magic