This patch is similar to d525db79. The same reasoning applies here as well, as to why this bug existed.