Okay, I am going to commit #4613 for now and I will update it to use this with #4616 once this has been merged.