Revert "Merge branch 'backport-fix-load-error' into 'master'"
I'm not sure if the spec failures are legit, so I'm reverting this
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
I'm not sure if the spec failures are legit, so I'm reverting this