Correct bad merge from release-0.7.x to release-1.0.x
Correct bad merge from release-0.7.x to release-1.0.x

A bad merge resulted in `expand_alias` to recursively call itself
forever. This patch just reverts the offending line.

reviewboard/rbtools,reviewboard/rbtools,reviewboard/rbtools