Hi Aaron,
As per your ticket "There is a patch being reviewed at the moment that will address this issue in 2.5 and 2.6.". I believe you have the necessary code fix.
regards,
George.