[579051] Tidy up post-reversion
4 files changed