Hopefully the last user-g commit