Revert "Fix macaroon_secret_key fallback logic"
Revert "Fix macaroon_secret_key fallback logic"

This is already fixed in 0.34.1, by 59f93bb

This reverts commit efc522c55e996e420271de2d9094835dda52ade4.

matrix-org/synapse,matrix-org/synapse,matrix-org/synapse,matrix-org/synapse,matrix-org/synapse,matrix-org/synapse