Here's a patch that replaces the defalias with an advice-add.