Update compatibility between latest stable and trunk

Trunk should use faster solution, but latest stable should still be able
to compile