Takes care of https://github.com/pyrocms/pyrocms/pull/3207