Revert "Tweaks for forward compatibility"

This reverts commit be5125b1341807ce014ed101ad46824bdf9737e2.