Core/Misc: Missing changes from 8968dbc (Partial revert of 2292025)
Closes #8843