am c15bbb52: Retire Delight2 migration code to speed up tests.

* commit 'c15bbb52a37be751fed2ba7e765dfd7727306308':
  Retire Delight2 migration code to speed up tests.