Revert "Use function instead of alias"

This reverts commit d3abdb04f8a83bf2749795af98b6b95713130370.