* Fix #6154 This is a web edit * This is not a web edit (It's still broken) * Fix more missing files from the patch