Respect 1.8.7

2.3.4 broke 1.8.7.  Even though 1.8.7 is sunsetted there's no need to
break existing application with 1.8.7