Manually reverted Madison's commit.