Revert attempt. Add TODO