The patch applied as f6018c14d9 wasn't
intended to be merged. This cleans up said patch and touches
up surrounding documentation a bit.
This compiles but is untested as I don't currently have access to
hardware. (Just wanted to ensure the build isn't left broken all day!)
My apologies if this inconvenience anyone!