Revert "Enable the four custom instructions"

This reverts commit 70b52dd5fa74b5968a20ded22df4ae3a9a76d7f4.

Refactoring support for custom instructions.