Revert a bug fix and fix documentation.