regression from f69df53b

we presumably should process comments and go through their
emfplus contents too, or something of that nature

Change-Id: Ifa8c3f058f0a320057d02b53f5717eaa42e63282