Reviewed r/2875 and continued work on bug 1073732