Revert "block: Disable driver-specific options for 1.6"