Signed-off-by: Tad <tad@spotco.us>
Will need some work to apply on 17.1/18.1 Signed-off-by: Tad <tad@spotco.us>