Revert "Tweaks for forward compatibility"

This reverts commit 981a455b573b2d8f4dec945b2ae34ddce521d29e.