Revert "https://bugzilla.wikimedia.org/show_bug.cgi?id=60213"

This reverts commit 306d42726eb1fcef1eb1166a995694082e09b6e5.