Actually fixing 1.8.7 Rpc spec