Remove Diablo compatibility options

According to the fixme in the code, these should have been removed
in Folsom.

Change-Id: If11c576e45931b72c227f51a0b8f63bc5f7dd4cb