I think this "extend self" was removed as part of OHAI-489, so it would probably be good to rebase.