Revert previous workarounds
2 files changed