FS-4435 looks ok at a glance, at least this code is isolated to the small few who actually use it so i will put it in for testing