Switch to 1.8.7 compatible syntax for now.

1.8.7 support will be removed with 2.0