Fixing non-functioning code committed in 4f272ec.  Fixes #1306.
Fixing non-functioning code committed in 4f272ec.  Fixes #1306.