Revert previous change for now