follow up to r113113, get rid of code ducpliation and fix docs to reflect actual...