Revert change to model as it doesn't work when not using post_type
Revert change to model as it doesn't work when not using post_type