Bug 1030740 - Add return statements inadvertently omitted from Bug 1025937. r=mcomella, a=sylvestre