LIMS-1059 fixup

https://github.com/bikalabs/Bika-LIMS/commit/dcbaf44d481f22b87a80d10e920937ec2ca733dd#commitcomment-6885430
LIMS-1218 Replace terrible monkey patch with a better one.