Messed up the code comment on the last patch, please use this patch
instead (also added Bug# to commit message).