Use global aliastable and proper fix #2941
Partial revert of 5b431a20dea since the introduced parameter is not working as expected