Removed crud from merge
Finished feature 48308315/iframe-content-scripts.