Cleanup for previous change.