Revert changes for now, pending discussion