r1929 + revert typo introduced by changeset:1772 (pointed by Aaron Dummer)