We would need to modify this too.
I had merged this PR locally and it resulted in huge overhead being computed - resulting in job failures due to master running out of memory.