Revert changes

These are happening in
https://github.com/G5/g5-content-management-system/pull/497/files