Revert "Merge remote-tracking branch 'origin/develop' into wagtaildemo"

This reverts commit bed539affdeefd66f741664af3091035d1f5eb83, reversing
changes made to 0aa01ca9b71edd71e89e2d6ceb3e27a13de21ce5.
Fixed a circular import