This reverts commit 7c8385a352ba21cb388046290d93b53dc273cd9f with a typing fix to an instruction selection pattern.