Revert "Add shortrules to Makefile, enable."

This reverts commit 58d7bf855e7fc3733ec43cc63147910c4d4a5727.