#781 - Reverting the publicAlias when possible