[releng] Revert changes requiring post M3 OCL
4 files changed