Read comment about not fixing everything in this ticket. Maybe lvutil is a better place