Revert "shortcut"

This reverts commit a311e4b509b02dc9338db4a08bb34c50e17c5320.