This completes commit 91da12250193e51197c982d57984228, sorry.

Authored by zwabel on Aug 18 2012, 3:14 PM.