Yeah, it was broken before this change also.