until we kill off 1.8.7 support, this is how it has to be done.