merge in aliasinput change, reverted