Revert "Use dev-master"

This reverts commit ec9512af61feb3c8624d18b02be389c939f8e6d0.
Revert "Try an inline alias"

This reverts commit acf2072169933f2017b0e29deae41a5eff852427.