AMK's revised version of the previous patch.
3 files changed