Created by: unusualcrow
Fixes #13093 (closed) and essentially does what #13095 did but better I guess