Revert "Updates recommended by Triffid"

This reverts commit 27bd9e181f6182d90f123905e8d955092cbff978.
Revert "Revert "Updates recommended by Triffid""

This reverts commit 366b87be6caf94b81f2ef30013551c785e22584c.