NOTE: This patch has been superseded by patch 200406251-1.