Re-added CKEditor media integration patch for testing.