[XLS-514] Revert previous commit.