Fix for spammer re-applied

Core:\n- Some updates to the spammer were reverted due to git being a git.