Adds changes missing from commit a0be398.