Add back missing lines: commit d1eb4b8