Add Remove SCOM Maintenance Mode

My team uses SCCM to manage and patch our servers it would be nice to be able to right click and add or remove a collection from maintenance mode in SCOM. This would help bridge the gap between the two products that has existed for many years and is has been ask for in Microsoft's user voice as well. I have found a management pack that can do the Add part but it falls short when the maintenance finishes early there is no way to remove those machines from maintenance mode easily with out having to get someone from SCOM team involved.