That's what we did. All the fancy junk got replaced with stock stuff and no leaks.