Brown bad commit -- was too eager to remove 'redundant' code.