revert to before multimedia merge