second attempt to fix building against 0.15.x