Cleanup of previous patch
Bug 883869 - Clean up MediaPipeline changes from bug 868405. r=jesup