First pass 1.8.7 compatibility