Patched to work with latest update to Oxide and Rust.