Revert commented out code