Revert "Move to new selector interpolation, supported from 1.3.1"

This reverts commit 6b9bb547bf275d8723d50b16fbb22ba9e334da39.