am b36bba6d: Merge "Also remove environment links to removed instructions."

* commit 'b36bba6d35e88687852b108c8d4b73b3ec2a9397':
  Also remove environment links to removed instructions.