Revert "Compat fix for 1.3"

This reverts commit d9c3146c97b465bd40c0acb58cceb31911fc02a2.