move focus fix for api changes somewhere in 3.14.0-2

This breaks downward compatibility.