Revert "Make compatible with < 1.9.3"

This reverts commit 27c942334fc77c6c6f4eb0e6fe08a034692c1182.