Revert fixes since we're not using 4.8