Revert 589da8 since it was taken care of in 3.7