Backed out previous patch.