Commit from picturefill branch, again.