Reverted changes so that the block-diagonal form (technically
incorrect), works properly.