Revert "Merge branch 'expired-ci-artifacts' into 'master'"

This change caused SQL timeouts in https://gitlab.com/gitlab-com/infrastructure/issues/3711, so we need to revert ASAP.

This partially reverts merge request !16578 (merged). It keeps the database changes but not the SQL changes.