Issue #1586542 followup by andypost: Workaround for an issue where system update #7061 fails due to a memory leak and can't be run again.
